-
Notifications
You must be signed in to change notification settings - Fork 24
delete blacklisted attachments from message and replace with webhook #520
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
delete blacklisted attachments from message and replace with webhook #520
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please address the changes I wrote in the review comments.
Also, please use a proper/professional commit message. You can change the commit message of your existing commit using git commit --amend
(optionally with -m <message>
) and then force-pushing to your branch with git push --force-with-lease
.
src/main/java/net/discordjug/javabot/data/config/GuildConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/BlacklistedMessageAttachmentListener.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/BlacklistedMessageAttachmentListener.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/BlacklistedMessageAttachmentListener.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/BlacklistedMessageAttachmentListener.java
Outdated
Show resolved
Hide resolved
Please also fix the checkstyle errors. We use tabs for indentation. |
src/main/java/net/discordjug/javabot/listener/BlacklistedMessageAttachmentListener.java
Outdated
Show resolved
Hide resolved
699283b
to
a2b3d33
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please see the comments.
Other things to eventually convert to a filter:
- AutoMod (please do this in this PR)
- suggestions (can be another PR)
- code formatting in help channel (can be in another PR)
It might als be a good idea to add an overload to WebhookUtil.replaceMessage
without embeds/attachments to make the code simpler instead of having to add a null
argument wherever calling it.
src/main/java/net/discordjug/javabot/data/config/GuildConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/HugFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/HugFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/handler/MessageFormatHandler.java
Outdated
Show resolved
Hide resolved
a2b3d33
to
2d539ab
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also fix the CI failures.
src/main/java/net/discordjug/javabot/listener/filter/MessageFormatFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageModificationStatus.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/util/MessageActionUtils.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
2d539ab
to
1cb7604
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please still fix the CI failures.
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
1cb7604
to
1bc0ebd
Compare
src/main/java/net/discordjug/javabot/listener/filter/HugFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageContent.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageModificationStatus.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilterHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageContent.java
Outdated
Show resolved
Hide resolved
1bc0ebd
to
5ab7962
Compare
src/main/java/net/discordjug/javabot/listener/filter/MessageContent.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageContent.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/MessageFilter.java
Outdated
Show resolved
Hide resolved
src/main/java/net/discordjug/javabot/listener/filter/BlacklistedMessageAttachmentFilter.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
testing results
new crazy amazing feature where if someone sends a message with a forbidden attachment then that attachment is removed and the whole message is replaced as a webhook with only the good attachments
works server wide
config in guild config